From 8ab8b58b8ca5a34422a1a7b7b3898e92fa68a523 Mon Sep 17 00:00:00 2001
From: Akos Kiss <akiss@inf.u-szeged.hu>
Date: Sun, 21 Dec 2014 18:00:39 +0100
Subject: [PATCH] Use std::collections::{BTreeSet, BTreeMap} instead of
 std::collections::{TreeSet, TreeMap}.

---
 src/bin/cargo.rs                  | 6 +++---
 src/cargo/core/resolver/encode.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index c70448da5..5a5c1b085 100644
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -5,7 +5,7 @@ extern crate serialize;
 #[phase(plugin, link)] extern crate log;
 #[phase(plugin, link)] extern crate cargo;
 
-use std::collections::TreeSet;
+use std::collections::BTreeSet;
 use std::os;
 use std::io;
 use std::io::fs::{mod, PathExtensions};
@@ -187,9 +187,9 @@ fn execute_subcommand(cmd: &str, args: &[String], shell: &mut MultiShell) {
 
 /// List all runnable commands. find_command should always succeed
 /// if given one of returned command.
-fn list_commands() -> TreeSet<String> {
+fn list_commands() -> BTreeSet<String> {
     let command_prefix = "cargo-";
-    let mut commands = TreeSet::new();
+    let mut commands = BTreeSet::new();
     for dir in list_command_directory().iter() {
         let entries = match fs::readdir(dir) {
             Ok(entries) => entries,
diff --git a/src/cargo/core/resolver/encode.rs b/src/cargo/core/resolver/encode.rs
index f6670e197..cd12897e6 100644
--- a/src/cargo/core/resolver/encode.rs
+++ b/src/cargo/core/resolver/encode.rs
@@ -1,4 +1,4 @@
-use std::collections::{HashMap, TreeMap};
+use std::collections::{HashMap, BTreeMap};
 
 use regex::Regex;
 use serialize::{Encodable, Encoder, Decodable, Decoder};
@@ -15,7 +15,7 @@ pub struct EncodableResolve {
     metadata: Option<Metadata>,
 }
 
-pub type Metadata = TreeMap<String, String>;
+pub type Metadata = BTreeMap<String, String>;
 
 impl EncodableResolve {
     pub fn to_resolve(&self, default: &SourceId) -> CargoResult<Resolve> {
-- 
2.30.2